Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Thu, 30 Nov 2017 15:37:43 +0000 (10:37 -0500)
committerTom Rini <[email protected]>
Thu, 30 Nov 2017 15:37:43 +0000 (10:37 -0500)

Trivial merge